More "zero value added" language cleanups.

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index e2c309ac000de871bb06d4dcb8f9956b95e7780f..cc445c91c45f8e4d6c903616900c30f58d93e98d 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -377,6 +377,7 @@ signed int be_read16(void *p);
 signed int be_read32(void *p);
 signed int le_read16(void *p);
 signed int le_read32(void *p);
+void le_read64(void *dest, const void *src);
 void be_write16(void *pp, unsigned i);
 void be_write32(void *pp, unsigned i);
 void le_write16(void *pp, unsigned i);

diff --git a/gpsbabel/easygps.c b/gpsbabel/easygps.c
index 7ec472e4fbae41a32c06f2511b9f68e31b4f5c38..cb53059aeb606254a4ec393ab53ab8b863395363 100644 (file)
--- a/gpsbabel/easygps.c
+++ b/gpsbabel/easygps.c
@@ -212,7 +212,7 @@ static void
 ez_disp(const waypoint *wpt)
 {
        char tbuf[8];
-       fprintf(file_out, "W", 0xb);
+       fprintf(file_out, "W");
        if (wpt->shortname) {
                fputc(1, file_out);
                write_pstring(wpt->shortname);

diff --git a/gpsbabel/garmin_tables.h b/gpsbabel/garmin_tables.h
index c7d56c99dab379efe0a4970e06b608f4aa7dbbd9..c6481f2f561a7287dde07b4607b8be8abe262e63 100644 (file)
--- a/gpsbabel/garmin_tables.h
+++ b/gpsbabel/garmin_tables.h
@@ -31,6 +31,10 @@ typedef enum {MAPSOURCE, PCX, GARMIN_SERIAL} garmin_formats_e;
 extern const 
 char *mps_find_desc_from_icon_number(const int icon, 
        garmin_formats_e garmin_format);
+extern int
+mps_find_icon_number_from_desc(const char *desc, 
+       garmin_formats_e garmin_format);
+
 
 /* MapSource 4.13 */
 static icon_mapping_t icon_table[] = {

diff --git a/gpsbabel/gpilots.c b/gpsbabel/gpilots.c
index e39c5b8a35590acb8ad56d7ed5a54949c4067bf3..e9dce03cdb522ae3b624b4280b8719bc4af6939a 100644 (file)
--- a/gpsbabel/gpilots.c
+++ b/gpsbabel/gpilots.c
@@ -184,7 +184,7 @@ data_read(void)
                        /* blah */
                        break;
                default:
-                       fatal(MYNAME ": Unknown file type 0x%x\n", pdb->type);
+                       fatal(MYNAME ": Unknown file type 0x%x\n", (int) pdb->type);
        }
        
        for(pdb_rec = pdb->rec_index.rec; pdb_rec; pdb_rec=pdb_rec->next) {

diff --git a/gpsbabel/jeeps/gpsmath.c b/gpsbabel/jeeps/gpsmath.c
index c5c623335aa78e8a784aa22f2199c40b076638b5..bddf5f1dab13b1ddd9659d267624dd875643bc86 100644 (file)
--- a/gpsbabel/jeeps/gpsmath.c
+++ b/gpsbabel/jeeps/gpsmath.c
@@ -22,6 +22,7 @@
 ** Boston, MA  02111-1307, USA.
 ********************************************************************/
 #include "gps.h"
+#include <stdlib.h>
 #include <math.h>
 #include <string.h>
 #include "gpsdatum.h"

diff --git a/gpsbabel/jeeps/gpsutil.c b/gpsbabel/jeeps/gpsutil.c
index 3674331205ab9b01faca86623668a05cab41d64e..7311d019a638e052f4df63ec2d20c4538758da5e 100644 (file)
--- a/gpsbabel/jeeps/gpsutil.c
+++ b/gpsbabel/jeeps/gpsutil.c
@@ -22,6 +22,7 @@
 ** Boston, MA  02111-1307, USA.
 ********************************************************************/
 #include "gps.h"
+#include <stdlib.h>
 #include <fcntl.h>
 #include <stdarg.h>
 

diff --git a/gpsbabel/mapsend.c b/gpsbabel/mapsend.c
index d1cb83b7e465ebae7fca34a551742084648c186b..153af1d0ffbd6580694eb21ccf7eb71c34824a03 100644 (file)
--- a/gpsbabel/mapsend.c
+++ b/gpsbabel/mapsend.c
@@ -524,7 +524,7 @@ void mapsend_track_hdr(const route_head * trk)
        char *tname;
        unsigned char c;
        int i;
-       mapsend_hdr hdr = {13, "4D533334 MS", "30", ms_type_track, 0};
+       mapsend_hdr hdr = {13, "4D533334 MS", "30", ms_type_track, {0}};
        
        switch (trk_version) {
                case 20: verstring = "30"; break;
@@ -619,7 +619,7 @@ mapsend_track_write(void)
 static void
 mapsend_wpt_write(void)
 {
-       mapsend_hdr hdr = {13, "4D533330 MS", "30", ms_type_wpt, 0};
+       mapsend_hdr hdr = {13, {"4D533330 MS"}, {"30"}, ms_type_wpt, {0}};
        int wpt_count = waypt_count();
        int n = 0;
        

diff --git a/gpsbabel/util.c b/gpsbabel/util.c
index 73852a1c5bc344b4d4889ff5175401264ee4a896..fbca2b8be167f5d2c4076110973cd0ba2df26605 100644 (file)
--- a/gpsbabel/util.c
+++ b/gpsbabel/util.c
@@ -372,7 +372,7 @@ le_read32(void *addr)
  *  in host endianness.
  */
 void
-le_read64(void *dest, void *src)
+le_read64(void *dest, const void *src)
 {
        char *cdest = dest;
        char *csrc = src;